From: Ray Strode <rstrode@redhat.com>
Date: Wed, 8 Oct 2014 13:39:44 +0000 (-0400)
Subject: screenShield: fix trace back when unlocking session from another vt
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~2045
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=4e8c4761530cc686c09c25ae3fda2dc4a024aa6c;p=gnome-shell.git

screenShield: fix trace back when unlocking session from another vt

commit 1d374ac8bd496f6fa6f4c55ffd207bd30bd50075 introduced a bug that
prevents unlock from working when initiated from another VT
(user switching).

This commit fixes the exception raised.

https://bugzilla.gnome.org/show_bug.cgi?id=708105
---

diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index 1c1dca6cf..32ef1ca9e 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -920,8 +920,10 @@ const ScreenShield = new Lang.Class({
         this._lockScreenState = MessageTray.State.HIDDEN;
         this._lockScreenGroup.hide();
 
-        this._dialog.actor.grab_key_focus();
-        this._dialog.actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
+        if (this._dialog) {
+            this._dialog.actor.grab_key_focus();
+            this._dialog.actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
+        }
     },
 
     _hideLockScreen: function(animate, velocity) {